Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add UWP .NET 9 support for MSTest extensions #3848

Merged
merged 53 commits into from
Feb 6, 2025
Merged

Add UWP .NET 9 support for MSTest extensions #3848

merged 53 commits into from
Feb 6, 2025
+785 −42

Conversation

Sergio0694
Copy link
Member

This PR includes the initial work to support UWP apps using .NET 9 (see here).
This tackles the extensions assembly:

  • Multi-target net8.0-10.0.26100.0 (we can bump to .NET 9 once it goes GA)
  • Define WINDOWS_UWP on this target
  • Pack this .dll into net8.0-windows10.0.26100.0/uwp
  • Update .targets to reference it if UseUwpTools is set (ie. this is a UWP app using .NET 9)

@Sergio0694 Sergio0694 force-pushed the user/sergiopedri/uwp-net9-support branch from 2ad0079 to 431954a Compare October 19, 2024 19:32
Youssef1313
Youssef1313 reviewed Nov 9, 2024
View reviewed changes
Directory.Build.props Outdated Show resolved Hide resolved
@Sergio0694 Sergio0694 force-pushed the user/sergiopedri/uwp-net9-support branch from d50771e to 29abbe2 Compare November 25, 2024 07:37
@Youssef1313
Copy link
Member

@Sergio0694 Looks like there is a packaging failure.

D:\a\_work\1\s\.dotnet\sdk\9.0.100\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(221,5): error NU5050: Attempted to pack multiple files into the same location(s). The following destinations were used multiple times: contentFiles\any\any\Extensions\WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml [D:\a\_work\1\s\src\Package\MSTest.Internal.TestFx.Documentation\MSTest.Internal.TestFx.Documentation.csproj]
##[error].dotnet\sdk\9.0.100\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(221,5): error NU5050: (NETCORE_ENGINEERING_TELEMETRY=Build) Attempted to pack multiple files into the same location(s). The following destinations were used multiple times: contentFiles\any\any\Extensions\WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml

@Evangelink
Copy link
Member

It's ok we will sync with @Sergio0694 offline this week to answer a couple of high level questions before we resume work here.

Thanks @Youssef1313

@adstep adstep mentioned this pull request Jan 29, 2025
Closed
Sergio0694 and others added 19 commits January 30, 2025 09:06
@Sergio0694
Update UWP sample project
7802d1d
@Sergio0694
Use file-scoped namespaces
ad21693
@Sergio0694
Merge branch 'main' into user/sergiopedri/uwp-net9-support
5415c69
@adam-stephenson
update verify nugpkgs numbers for build to work
b4c6df5
@adam-stephenson @Sergio0694
update verify nugpkgs numbers for build to work
4b7e89a
@adam-stephenson
Merge branch 'user/sergiopedri/uwp-net9-support' of https://github.co…
3dc6084 
…m/Sergio0694/testfx into user/sergiopedri/uwp-net9-support
@adam-stephenson
merge main
5167640
@Sergio0694
Merge pull request #3 from adstep/user/adstep/uwp-net9-latest-merge
83cc658 
User/adstep/uwp net9 latest merge
@Sergio0694
Remove leftover .csproj stuff on UWP
6255866
@Sergio0694
Remove unnecessary package reference
7786b71
@Sergio0694
Simplify ifdefs to clarify changes
2f7731e
@Sergio0694
Add missing trailing newline
1478232
@Sergio0694
Update .targets for new pack folder
fd23847
@Sergio0694
Fix path of packed .targets file
bbc4b81
@Sergio0694
Fix a typo
c63fb0c
@Sergio0694
Remove incorrect MSBuild condition
f07788d
@Sergio0694
Update path to new 'winui+uwp' folder
229fbc5
@Sergio0694
Add 'TestContainer' project capability
060d3d9
@Sergio0694
Merge branch 'main' into user/sergiopedri/uwp-net9-support
7b815d4
@Evangelink
Copy link
Member

Flakiness, I'll force merge. As discussed offline, the PR as-is might miss a few things but given it's pretty big, let's merge it and iterate on potential bugs/missing features we find along the way of dogfooding.

Thanks @Sergio0694 and @adstep :shipit:

@Evangelink Evangelink merged commit d950a32 into microsoft:main Feb 6, 2025
7 of 9 checks passed
@Sergio0694 Sergio0694 deleted the user/sergiopedri/uwp-net9-support branch February 6, 2025 20:48
@Sergio0694
Copy link
Member Author

Thank you!! 🎉🎉🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adstep adstep adstep left review comments

@Youssef1313 Youssef1313 Youssef1313 left review comments

@Evangelink Evangelink Evangelink approved these changes

@MarcoRossignoli MarcoRossignoli Awaiting requested review from MarcoRossignoli MarcoRossignoli is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Sergio0694 @Youssef1313 @Evangelink @adstep @adam-stephenson